home *** CD-ROM | disk | FTP | other *** search
/ The Atari Compendium / The Atari Compendium (Toad Computers) (1994).iso / files / prgtools / gnustuff / tos / updates / update19.zoo / gcc2.1 / tm_diff < prev    next >
Encoding:
Text File  |  1992-03-28  |  4.3 KB  |  142 lines
  1. Here are my diffs to tm-atari.h.  ANSI compiler is assumed for
  2. string contatenation.  With this I have something like this
  3. at the start of mine Makefiles:
  4.  
  5. CROSSDIR = /usr/users/michal/ST/cross-gcc
  6. CROSSBIN = $(CROSSDIR)/bin
  7. CROSSLIB = $(CROSSDIR)/lib
  8. CROSSINC = $(CROSSDIR)/include
  9. GCC_INCLUDE_DIR = $(CROSSINC)
  10. GPLUSPLUS_INCLUDE_DIR = $(CROSSDIR)/g++-inc
  11.  
  12. srcdir=.
  13. INCLUDES = -I. -I$(srcdir) -I$(srcdir)/config
  14.  
  15. CFLAGS= -g -O2  $(INCLUDES) -DCROSSATARI=1 -DCROSSDIR=\"$(CROSSDIR)\" \
  16. -DSTANDARD_EXEC_PREFIX=\"$(CROSSDIR)/bin/cgcc-\"
  17.  
  18. and for a native compiler file you will find something like that:
  19.  
  20. CROSSDIR = c:/gnu
  21. CROSSBIN = $(CROSSDIR)/bin
  22. CROSSLIB = $(CROSSDIR)/lib
  23. CROSSINC = $(CROSSDIR)/include
  24. GCC_INCLUDE_DIR = $(CROSSINC)
  25. GPLUSPLUS_INCLUDE_DIR = $(CROSSDIR)/g++-inc
  26. HOSTINC = /usr/users/michal/ST/cross-gcc/include
  27. srcdir=.
  28. INCLUDES = -I. -I$(srcdir) -I$(srcdir)/config -I$(HOSTINC)
  29. DFLAGS= -DCROSSDIR=\"$(CROSSDIR)\" -DGNULIB=\"c:\\\\gnu\\\\lib\" \
  30. -DSTANDARD_EXEC_PREFIX=\"c:/gnu/bin/gcc-\"
  31.  
  32. CFLAGS= -O2 $(INCLUDES) -Datarist=1 $(DFLAGS) #-m68020
  33. #CFLAGS= -O -I$(CROSSINC) -I./config -I. -Datarist=1
  34.  
  35. HOSTCFLAGS = -O -I./config -I.
  36. CC=cgcc
  37.  
  38. with the same configuration files.  Minix variants are left as
  39. an exercise to the reader. :-)
  40.  
  41.  
  42. --- tm-atari.h~    Mon Mar 16 10:01:55 1992
  43. +++ tm-atari.h    Mon Mar 16 18:13:31 1992
  44. @@ -110,15 +110,15 @@
  45.  
  46.  /* default exec dir */
  47.  #ifndef STANDARD_EXEC_PREFIX
  48. -#ifdef MINIX
  49. -#define STANDARD_EXEC_PREFIX "/net/acae127/home/bammi/atari/cross-minix/lib/gcc-"
  50. -#else
  51. -#ifdef atariminix
  52. -#define STANDARD_EXEC_PREFIX "/usr/local/lib/gcc-"
  53. -#else
  54. -#define STANDARD_EXEC_PREFIX "/net/acae127/home/bammi/atari/cross-gcc/lib/gcc-"
  55. -#endif
  56. -#endif
  57. +#  ifdef MINIX
  58. +#    define STANDARD_EXEC_PREFIX CROSSDIR "/lib/gcc-"
  59. +#  else
  60. +#    ifdef atariminix
  61. +#      define STANDARD_EXEC_PREFIX "/usr/local/lib/gcc-"
  62. +#    else
  63. +#      define STANDARD_EXEC_PREFIX CROSSDIR "/lib/gcc-"
  64. +#    endif
  65. +#  endif
  66.  #endif
  67.  
  68.  #define STANDARD_STARTFILE_PREFIX ""
  69. @@ -222,30 +222,30 @@
  70.  
  71.  #ifdef MINIX
  72.  #define STARTFILE_SPEC  \
  73. -  "%{pg:/net/acae127/home/bammi/atari/cross-minix/lib/gcrtso.o%s}\
  74. +  "%{pg:" CROSSDIR "/lib/gcrtso.o%s}\
  75.     %{!pg:\
  76. -         %{p:/net/acae127/home/bammi/atari/cross-minix/lib/mcrtso.o%s}\
  77. -         %{!p:/net/acae127/home/bammi/atari/cross-minix/lib/crtso.o%s}}"
  78. +         %{p:" CROSSDIR "/lib/mcrtso.o%s}\
  79. +         %{!p:" CROSSDIR "/lib/crtso.o%s}}"
  80.  #else
  81.  #define STARTFILE_SPEC  \
  82.    "%{mint:\
  83. -      %{pg:/net/acae127/home/bammi/atari/cross-gcc/lib/mgcrt0.o%s}\
  84. +      %{pg:" CROSSDIR "/lib/mgcrt0.o%s}\
  85.        %{!pg:\
  86. -             %{p:/net/acae127/home/bammi/atari/cross-gcc/lib/mmcrt0.o%s}\
  87. -             %{!p:/net/acae127/home/bammi/atari/cross-gcc/lib/mcrt0.o%s}}}\
  88. +             %{p:" CROSSDIR "/lib/mmcrt0.o%s}\
  89. +             %{!p:" CROSSDIR "/lib/mcrt0.o%s}}}\
  90.  \
  91.    %{!mint:\
  92. -      %{pg:/net/acae127/home/bammi/atari/cross-gcc/lib/gcrt0.o%s}\
  93. +      %{pg:" CROSSDIR "/lib/gcrt0.o%s}\
  94.        %{!pg:\
  95. -             %{p:/net/acae127/home/bammi/atari/cross-gcc/lib/mcrt0.o%s}\
  96. -             %{!p:/net/acae127/home/bammi/atari/cross-gcc/lib/crt0.o%s}}}"
  97. +             %{p:" CROSSDIR "/lib/mcrt0.o%s}\
  98. +             %{!p:" CROSSDIR "/lib/crt0.o%s}}}"
  99.  #endif
  100.  #endif /* CROSSATARI */
  101.  
  102.  #ifdef MINIX
  103.  #define LIB_SPEC \
  104. -  "%{mshort:/net/acae127/home/bammi/atari/cross-minix/lib/libc.a}\
  105. -   %{!mshort:/net/acae127/home/bammi/atari/cross-minix/lib/libc32.a}"
  106. +  "%{mshort:" CROSSDIR "/lib/libc.a}\
  107. +   %{!mshort:" CROSSDIR "/lib/libc32.a}"
  108.  #else
  109.  #ifdef atariminix
  110.  #define LIB_SPEC \
  111. @@ -345,18 +345,30 @@
  112.  
  113.  /* all the INCLUDE_DEFAULTS */
  114.  #ifdef CROSSATARI    /* TOS or MINIX cross compiler */
  115. +#ifndef SYSTEM_INCLUDE_DIR
  116.  #  define SYSTEM_INCLUDE_DIR        CROSSINC
  117. +#endif
  118. +#ifndef SYSTEM_GPLUSPLUS_INCLUDE_DIR
  119.  #  define SYSTEM_GPLUSPLUS_INCLUDE_DIR    GPLUSPLUS_INCLUDE_DIR
  120.  #endif
  121. +#endif
  122.  
  123.  #ifdef atarist        /* TOS native compiler */
  124. +#ifndef SYSTEM_INCLUDE_DIR
  125.  #  define SYSTEM_INCLUDE_DIR        "\\gnu\\lib"
  126. +#endif
  127. +#ifndef SYSTEM_GPLUSPLUS_INCLUDE_DIR
  128.  #  define SYSTEM_GPLUSPLUS_INCLUDE_DIR    "\\gnu\\g++-inc"
  129.  #endif
  130. +#endif
  131.  
  132.  #ifdef atariminix    /* MINIX native compiler */
  133. +#ifndef SYSTEM_INCLUDE_DIR
  134.  #  define SYSTEM_INCLUDE_DIR        "/usr/local/gcc-include"
  135. +#endif
  136. +#ifndef SYSTEM_GPLUSPLUS_INCLUDE_DIR
  137.  #  define SYSTEM_GPLUSPLUS_INCLUDE_DIR    "/usr/local/g++-inc"
  138. +#endif
  139.  #endif
  140.  
  141.  #define INCLUDE_DEFAULTS            \
  142.